This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Fix registration with email #2967
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We look to see if there's already a user logged in and if there is, restore that session instead of logging the user in as their new account. We still set this 'is_registered' flag though, even though in that case it's not a newly registered account that's being restored, so don't set in that case.
Regressed in #2768 where we check for an existing stored account first and restore that instead if it exist, telling the user. We usually make a guest account when the user first hits the page though, so this just restored this guest account. Don't restore the account if it's just a guest account (which, as per comment, is not perfect, but is definitely better than the current behaviour). Fixes element-hq/element-web#9581
jryans
approved these changes
May 14, 2019
src/Lifecycle.js
Outdated
| @@ -131,8 +131,8 @@ export function getStoredSessionOwner() { | |||
| * for a real user. If there is no stored session, return null. | |||
| */ | |||
| export function getStoredSessionIsGuest() { | |||
| const {hsUrl, isUrl, accessToken, userId, deviceId, isGuest} = _getLocalStorageSessionVars(); | |||
There was a problem hiding this comment.
Hmm, I guess you also could have removed the unused ones (deviceId and isUrl) to satisfy the linter...? Anyway, either is fine of course.
There was a problem hiding this comment.
oh, yes - I think I was getting confused between array and object destructuring.
This was referenced May 14, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A PR presented in
twothree acts.Act 1, in which we don't set the 'is_registered' flag if we're just restoring an existing account.
Act 2, in which we don't restore guest accounts since we'll usually have one of these when registering.
Act 3, in which Dave has a fight with the linter.
See individual commit messages for more detail.
Regressed in: #2768
Fixes: element-hq/element-web#9581